From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 30 Mar 2025 15:02:56 +0000 (+0100)
Subject: cqueues: lua-5.3, 5.4 variants
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=af9abf95c9c78e388cf92365a80a2cee497b1dcf;p=feed%2Fpackages.git

cqueues: lua-5.3, 5.4 variants

Build upstream's support for lua 5.3 and 5.4

Signed-off-by: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
---

diff --git a/lang/cqueues/Makefile b/lang/cqueues/Makefile
index f3a2165122..14191c695b 100644
--- a/lang/cqueues/Makefile
+++ b/lang/cqueues/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cqueues
 PKG_VERSION:=20200726
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Siger Yang <siger.yang@outlook.com>
 
 PKG_MIRROR_HASH:=214a09c250e92d12cd63cdaedce9491f874a920e8222cc4faf10a978ec7bd1bd
@@ -24,16 +24,16 @@ PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/cqueues
+define Package/cqueues/default
   SUBMENU:=Lua
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=lua cqueues
+  TITLE:=cqueues for $(1)
   URL:=http://25thandclement.com/~william/projects/cqueues.html
-  DEPENDS:=+liblua +libopenssl
+  DEPENDS:=+libopenssl
 endef
 
-define Package/cqueues/description
+define Package/cqueues/default/description
  Continuation Queues: Embeddable asynchronous networking, threading, and
  notification framework for Lua on Unix. 
 endef
@@ -41,10 +41,49 @@ endef
 TARGET_CFLAGS += $(FPIC)
 TARGET_LDFLAGS += $(FPIC)
 
-MAKE_FLAGS += \
+define Package/cqueues
+  $(call Package/cqueues/default,lua5.1)
+  DEPENDS+=+liblua
+  VARIANT:=lua51
+endef
+
+define Package/cqueues-lua5.3
+  $(call Package/cqueues/default,lua5.3)
+  DEPENDS+=+liblua5.3
+  VARIANT:=lua53
+endef
+
+define Package/cqueues-lua5.4
+  $(call Package/cqueues/default,lua5.4)
+  DEPENDS+=+liblua5.4
+  VARIANT:=lua54
+endef
+
+Package/cqueues/description = $(Package/cqueues/default/description)
+Package/cqueues-lua5.3/description = $(Package/cqueues/default/description)
+Package/cqueues-lua5.4/description = $(Package/cqueues/default/description)
+
+ifeq ($(BUILD_VARIANT),lua51)
+  MAKE_FLAGS += \
 	LUA_APIS="5.1" \
+	LUA51_CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
 	lua51cpath="/usr/lib/lua" \
 	lua51path="/usr/lib/lua"
+endif
+ifeq ($(BUILD_VARIANT),lua53)
+  MAKE_FLAGS += \
+	LUA_APIS="5.3" \
+	LUA53_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.3" \
+	lua53cpath="/usr/local/lib/lua/5.3" \
+	lua53path="/usr/local/lib/lua/5.3"
+endif
+ifeq ($(BUILD_VARIANT),lua54)
+  MAKE_FLAGS += \
+	LUA_APIS="5.4" \
+	LUA54_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.4" \
+	lua54cpath="/usr/local/lib/lua/5.4" \
+	lua54path="/usr/local/lib/lua/5.4"
+endif
 
 define Package/cqueues/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua
@@ -54,4 +93,21 @@ define Package/cqueues/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/cqueues $(1)/usr/lib/lua/
 endef
 
+define Package/cqueues-lua5.3/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/_cqueues.so $(1)/usr/local/lib/lua/5.3
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/cqueues.lua $(1)/usr/local/lib/lua/5.3
+
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/cqueues $(1)/usr/local/lib/lua/5.3
+endef
+define Package/cqueues-lua5.4/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/_cqueues.so $(1)/usr/local/lib/lua/5.4
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/cqueues.lua $(1)/usr/local/lib/lua/5.4
+
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/cqueues $(1)/usr/local/lib/lua/5.4
+endef
+
 $(eval $(call BuildPackage,cqueues))
+$(eval $(call BuildPackage,cqueues-lua5.3))
+$(eval $(call BuildPackage,cqueues-lua5.4))